changes
changes
corrected several bugs