better fab and bug fixes