responsiveness added, bugs fixed