18th Iteration

More fine tuning/tweaks fixing little details