merged changes from st. aidan's last x-flixel commit