improved default shortcuts
use quickfix to gather
better formatting
adjusted to new indentation