more fix - less bugs