Extended and fixed some stuff.