Minor fixes
First steps in creating 2nd version