[bugfix] can now have site keywords 1 letter long
Fixed minor TODOs