Plan updated, small bugs fixed