Fixed stuff and more