Cleaned up a bit more

Will not run with no records in database, modify doesn't work