More schtuff, cleanup of some variables, susy

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>