insert bomb + bugfixes