- fixed some minor bugs