changed database
fixed form