cleaned repo and added more logging