started settings. added alias functionality.
worked on settings
merge fix
route consolidation. renamed a bunch of functions for consistent naming.