done! :) + nitpicks