Fixed stuff and more stuff