BUGFIXES and UPDATES: made things a little more userfriendly and flexible