second commit

updates and fix