More userfriendly and fixes