Cleaned up unmount, added nesting to mount