bug fixes, elidable not working fully cause TBD