Lots of fixes

Signed-off-by: MaloW <MaloW@spray.se>