Added Advance To Next Line option for FSI
Simplified property access, cleaned up code