Cleaned up programming style
Removed symlink; git interacted poorly
Added several more superuser functions