Minor code maintenance

Spacing, fixing warnings, adding TODOs and PRIORITYs