wip
Real location support, and misc