Janitor work. Cleaned up errors, make output, put proper includes in everything