Many updates/bug fixes