3.0

Some updates I found necessary to make this usable