some cleans from earlier, still needs work