started ann stuff
fixed some bugs