Feature progress
Many new bugs fixed
More code cleanup