Another bunch of bugs were fixed. 3 left