Fixed somestuff up