Updated README examples + fixed a few small bugs