Bug fixes, additions, removals, fun faces :D