Starting to solve a few bugs. Pushed now to be able to develop on new computer.