Some tweaks
a few shortcuts