added stations, small syntax changes for consistency