Bug fixes and code cleanup.
Removed former framework target.
Target is now a static library.
Code cleanup.