+ minor cleanup + fixes