Fix comment/string indentation and keyword blocks

This fixes the last failing spec, also added a spec for the keyword blocks