Lots of fixes - should be working *updating disabled*