Fixed a few issues
Improve the database a bit
Add more links