added BCs and ICs, and updated solution schemes