fixed some bugs 10:38 12/25