Minor modifications.
 Remove dependency on wxpython