corrected things mentioned by Nick Collins