fixed more stuff. should be ok now