Bug fixes, more tests
Don't show all those annoying warnings
Bug fixes, more tests