more changes and fix up