still fixing more stuff