more fixes, ready to trim