style guide + some merged bugs