Add sigmask stuff and cleanup white space