Lots of changes

Remember to delete your old db and do syncdb after this.