More shortcuts, fixed markdown formatting