Changed table structure a bit, added new methods.

Changed some old ones.