added more stuff, tuning paramters