Fixes and code cleanup