upload class added, and minor enhanced navigation mode bugs fixed