fixed some bugs and cleared stuff up