fixed: fileupload broke, plus code style changes