fixes, new bugs, stuff

Signed-off-by: Miethpo <miethpomail@yahoo.co.uk>