Add support for XHDPI and minor bug fixes; resolve #2