removed whitespace
moved uncategorized things
whoops