Fixed some stuff? Maybe?