Various large changes
dzen cleanups
spacing