Update

Bug fixes and updated required file edits to make single curency work
with my hive edits.