fixed up a few small things in the code
merged updated skeleton to this branch