Ls1b

Various fixes and code formats.