view change fix + documentation / cleanup