add logger where necessary, add checking of passes paramaters, 
delete repeatable logging