Many bugfixes done for the final presentation.