final fixes before initial release
.
trying to fix errors
final fix
adding sorting
adding sorting