Misc stuff done

Signed-off-by: Mansour Behabadi <mansour@oxplot.com>