lame
fixed some bugs, all code working