test
making stuff work
Remove warnings
Remove warnings
Making small changes
Add javadocs
Make some changes in style following Anders standards
More style changes
small
Small changes to style
fixed merge