MOM-42 added logging and fixed some usability stuff