got more bugs fixed, seems to be performing like it should