A better way to handle missing dependencies. Some whitespace fixes.