Minor bug fixes
Many updates