made changes that albert needed
fix merge issues
weird text format issues?
fixed merge issues