more stuff added for wrapper
more random changes