Updated quite some stuff