bug fixes and enable load to billit