Streamlining of FarSecretAPI, added header blocks to templates, etc.