more fixes and explanations