responsive fixes, cleanup of code.