fixing overflow-x bug + minor fixes