Fixed a few things and began work on finish the research mechanic for @ellio98