fixes, fixes and even more fixes