fixed some weird-ass bugs