proposed fixes implemented, removed irrelevant files
proposed fixes implemented