testing phase

fixing bugs not related to tickets, mostly refactoring, adding debug
statements etc