fixed some bugs. items done