This should be ucfirst too

Signed-off-by: Suki <suki@missallsunday.com>
Some fixes

Signed-off-by: Suki <suki@missallsunday.com>