Fixed some sloppy stuff