Few tweaks

Another few tweaks. Still stuff todo.