Minor bugfixes

Close #16 - Links at the bottom.