simplify, fix minor issues