more

more stuff, haven't tested it