added bugs that were supposed to be added previously. bugs 18-21