fixed compilation issues
minor styling tweaks