Fixed some stuff... maybe...