updated some fixes and code conventions