Working on bugfixes