Bug fixes:
fix #40, fix #39, fix #38, fix #37, fix #21.
Code organization and cleanup...