removed some testing lines, and added so more