A number of bug fixes and performance enhancements

This is a rather large commit of various bug fixes and performance enhancemnets that have taken place during the process of open-sourcing. From here on we should be able to apply more focused pull-requests.
These status calculations are starting to take a bit too long, some refactors on the way but until then remove them.