some sloppy improvements