removed bool/int tags, added some comments