Closes #5

Also removed warnings in other files where possible