Latest version

Tried to make some other things work better, just subtle changes.