General updates and fixes

Created Gotham branch added dependencies which probably gotham requires idk, if it breaks its easy fix.