Boss improvments

closes #87