debugged few things