Small changes, Started working on rewrite