Fixed a few typos in comments and removed a few disused #define's