cleanup/fixes