some more fixes, and work on features