updated some parsing, added helper functions
fixed warehouseReport.cpp conflicts