add includeBounds option
refactore Upload
remove redundant stuff