Minor changes + fix for stupid whitespace issue