more fixes and options