Bugfixing & first + last