alot of minor fixes from 6.0