Add lock file
Fix incorrect boostrap paths
Fix missing use statement and some syntax errors
Fix any errors found on startup