another quick issue fix plus forgoten files