clean-up, new options, getting rid of unneeded code

Change-Id: I62092bd712f962d67e9734a1bdf0d27bee61c8d9
am/pm derp

Change-Id: Ib5f64ccfe15eb7b5570c2f065f47f19cf29caf12
Fix spacing derps
measure text

Change-Id: I5ab89281ad30ebbf8882bb80a6804c57694e42b0