fixing my fuck ups
merging