lots of changes and fixes, need to add support for having blank modes