fixes and credits
merge