Changes

Few style and database changes