Added more functions.
+ Other small changes.