! continuation of type hinting where required
! fix any dead assignments

Signed-off-by: Spuds <spuds@spudsdesign.com>