Added bullet and some minor functionality