added some misc
changes