all these small fixes, makes issues seem trivial