small bug fixes, handling &, ready for the planet