Fixed stuff and improved stuff