Did conversations for withdrawl

- did some random cleaning changes too