added init __main__
slow rate minor
minor
resolve conflict