Lots of bugs, working on kinks