Fixed **a lot** of bugs, now working