Fixed stuff, still an error tho