Most issues fixed