recent changes

Not major changes done yet, I have to add the functions I learned over
the weekend.