More usable. Random fixes