lot of bug fixes
hmmm