huge bug fixes
huge bug fixes