bug fixes and working process