comments
simple bug fixes