Fixade buggar inför release

Signed-off-by: Anton <anton_peace@hotmail.com>