More minor fixes, more working