fixed minor things, started working on class defs