Revert "small-fixes"

This reverts commit 75094ed5c8aa775247d818b602e49047b038f5b3.
update 0.5.3