few updates

naming fixes, some cleanup and a few updates