-Stations should work a little better now

-Removed some faulty logic around device ids