some fixes and polishing usw, but still so much to do