Entry point fixes and debug logging output removed
0.8.1