still fixes for scands, remove comments