* fixed some minor bugs