add some fixes and continue development