more things got tested, fixed some bugs too