EAPI bump and other small changes.  dependency updates to come and other changes