fixed bugs, pretty rock solid now