Fixes and doc write up