Made thread-safe singleton
Improved the scoring model
Minor bug fixes