still fixing stupid errors