fixed some errors in the trade prep, and some password issues