final + fixes