Minor fixes, no more singleton for Database ( you decide if you want it! ), better exceptions
Spaces