Changes from Hack the Tower

Plenty of changes for compliance with Apache POI
Merging cells + additional use cases