Added a bunch more tests. Added keitai.properties, wired up to use the properties, updated doco.