Fixes #32, #33 and #34

All tests runs and I will start using it it guests to verify that it works