bug fixes, ided more bugs