Improved logging. Made control non-executable for bug fixing