added user upload limits
added tests
typos
made no upload limit the default
fixed tests and defaults
fix after rebase
minor fixes after review
fixed indent problem