Basic user modes
Minor bug fixes