fixed some stuff but still broken