Various design and bug fixes
More design and bug fixes
Remove logging