corrected bugs #64, #66, #67 & #69