fixes #38; also added fixes for comments by adrian - in progress, TODO's and lang.extend outstanding