Working on bugfixes.