Minor update.
Useless methods removed, overall stability improved.