some visual changes + enemy manager organization
merge conflict enemy manager