minor changes
merging
merging
fixed enemy bug