Fixy

gonna clean up some stuff before merging into master.