Revert "Revert "polishing""

This reverts commit 5ebad81ddf80334c351367f016819eb48ebf3001.
Revert "Revert "added fireheart models... finally""

This reverts commit fb4889d472c689ecbde80725485ef7d7346f318f.
Revert "Revert "polishing and bug fixing""

This reverts commit 1a7b106dbdb65e17bcf7b448c7b7debe58b0eefb.