fixed some default behaviours