Fixing Codinglove
Bug fixes