fixed enemy gen on portal
merge portal stuff