general updated and bug fixes