bug fixes
start testing