got alt conflicts working; massive simplification and cleanup