Minor updates, finished Kaminari