commiting final changes, tried fixing connect-flash but couldn't