End of day 2, lot's of minor things worked out...

Signed-off-by: Swizzy <swizzy@hotmail.co.uk>