Nicer bull and some bug fixes