Merge in adam's compiled changes + my code padding change