strict cleanups
@imports work with whitespace
added make support