fix some codestyle (commit: 4e090d6)
switch to lockback and remove duplicate startup checks (commit: dd71c5f)