More things from the bugfix list
Clean up of some bugs