[RR-8] fixing bugs and formatting the files
Merge pull request #14 from HoldInArms/feature-more-details

[RR-8] fixing bugs and formatting the files