fixes

Some fixes and adding tags.