Working, fixes some stuff!