Implemented feedback on abstract

@droidstealth/developers ready for review!
:boom: