removed some deprecation warnings, altered spacing