Work in Progress

- Database Status
- Few null pointer exceptions cleaned up