Some bug fixes, some updates