Add enemy and some improvement