Made the app JRE 1.6 compliant and added a lock to make Sam happy