removed some bugs from final project