fixed some issues, now having mass-assignment exception