Some cleanup. Need to have different lua files for things.