Version 2.1

Cleaned up the code a little bit regarding variables and
intent.getStuff().