fixed some bugs
fixed bugs like crazy