some fixes
Initial commit