some fixes and credits