Some slight code cleanup and added Shapefile validation
Untested, but should be adding aux attrs to database