no idea what was changed
some minor fixes and additions