2014-06-22 | ajustments and clean ups

adjusted to new engine and clean up