did some more stuff...
merged changes