moajor bugs are fixend. needs to clean up
clean up
clean up
clean up