found 2 minor bugs + added some comment... the big bug still exists :(