more documentation + fix for model building
fixed merge