Fixed/changed some stuff