WIP fixes and improvements, almost there