added a couple more things and fixed some bugs