cleaned up unwanted features and fixed the bug