Adding paste app and fixing small issues