Final tweaks and changes, removed debugging