Fixed stuff better