big changes & fixes
new files