optimization and bug fixes