Renamed some methods.
Added some missing features.