fixing stuff; beginning methods
Merge remote-tracking branch 'lm1/master'