Code comments + minor bug fixes + Metabox content