spec.* refactoring + some tests;
model.* refactored;
add WSWrapper;
remove logging markers;