! next batch of type hinting etc

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