finished 2 day session
fixed picklist bugs