Fixed some useability issues