Some bug corrections, some additions, check the help file