am working on solutions to both these things. gif one may take a little longer.