Bug fixes, the code does now compile!