bugfing and notes