Added some last-minute changes, will remerge again
- Removed dependency from Lombok
- Cleaned Bitmap stuff