some fixes and make ups