Cleaning up some stuff and merging shit...