misc changes, more implemented