finishing up comments and action bar additional bugs