added start/end_yr arguments, code and path cleanup