bug fixes
fixed bug
starting to see the end...