Railway improved plus small fixes