Various fixes and improvements

This is the first stable version that is able to be used