Added loader for texts, bug fixes.
Merged