Fixes and features suggested by @aikar