added set remove hw and normal bp, and small bugfix