Minor fixes and code editing