minor structure improvements
added floating mode