bugged, debugged and bugged some files