minor fixes

minor fixes and beutification