Uploaded current data
Small updates
Removed a small amount of redundant code