Fixed some macros so they don't add extra spaces. Switched from input to include for chapters for faster recompile.