minor improvements
fix
fix
fix
fix
fix
fix
fix
wip
wip;
wip