More bugs

pulling before merging!