Basic handling of most bonus types implemented