some fixes and progress done!