Minor improvements to core.py: updated version, made more things Avalon-like.