Added Strict checking, shallow arguments and few bugfixes