Fixed minor complaints