refactoring and readme changes.. almost there...